From 87ab3ced3a3ff4b8fb92a537b2605399e43c6083 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 26 Feb 2002 20:10:52 +0000 Subject: [PATCH] use the cursor position _after_ deleting the text as the position to Tue Feb 26 15:04:33 2002 Owen Taylor * gtk/gtkentry.c (gtk_entry_enter_text): use the cursor position _after_ deleting the text as the position to insert at. (#72717, Jan Mynarik) --- ChangeLog | 8 +++++++- ChangeLog.pre-2-0 | 8 +++++++- ChangeLog.pre-2-10 | 8 +++++++- ChangeLog.pre-2-2 | 8 +++++++- ChangeLog.pre-2-4 | 8 +++++++- ChangeLog.pre-2-6 | 8 +++++++- ChangeLog.pre-2-8 | 8 +++++++- gtk/gtkentry.c | 3 ++- 8 files changed, 51 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8606a4d23d..cb9eea4523 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ -2002-02-26 Vitaly Tishkov +Tue Feb 26 15:04:33 2002 Owen Taylor + + * gtk/gtkentry.c (gtk_entry_enter_text): use + the cursor position _after_ deleting the text + as the position to insert at. (#72717, Jan Mynarik) + +2002-02-26 Vitaly Tishkov * gtk/gtktreemodel.c misprints in documentation for gtk_tree_row_reference_inserted() diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 8606a4d23d..cb9eea4523 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,4 +1,10 @@ -2002-02-26 Vitaly Tishkov +Tue Feb 26 15:04:33 2002 Owen Taylor + + * gtk/gtkentry.c (gtk_entry_enter_text): use + the cursor position _after_ deleting the text + as the position to insert at. (#72717, Jan Mynarik) + +2002-02-26 Vitaly Tishkov * gtk/gtktreemodel.c misprints in documentation for gtk_tree_row_reference_inserted() diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8606a4d23d..cb9eea4523 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,4 +1,10 @@ -2002-02-26 Vitaly Tishkov +Tue Feb 26 15:04:33 2002 Owen Taylor + + * gtk/gtkentry.c (gtk_entry_enter_text): use + the cursor position _after_ deleting the text + as the position to insert at. (#72717, Jan Mynarik) + +2002-02-26 Vitaly Tishkov * gtk/gtktreemodel.c misprints in documentation for gtk_tree_row_reference_inserted() diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 8606a4d23d..cb9eea4523 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,4 +1,10 @@ -2002-02-26 Vitaly Tishkov +Tue Feb 26 15:04:33 2002 Owen Taylor + + * gtk/gtkentry.c (gtk_entry_enter_text): use + the cursor position _after_ deleting the text + as the position to insert at. (#72717, Jan Mynarik) + +2002-02-26 Vitaly Tishkov * gtk/gtktreemodel.c misprints in documentation for gtk_tree_row_reference_inserted() diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8606a4d23d..cb9eea4523 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,4 +1,10 @@ -2002-02-26 Vitaly Tishkov +Tue Feb 26 15:04:33 2002 Owen Taylor + + * gtk/gtkentry.c (gtk_entry_enter_text): use + the cursor position _after_ deleting the text + as the position to insert at. (#72717, Jan Mynarik) + +2002-02-26 Vitaly Tishkov * gtk/gtktreemodel.c misprints in documentation for gtk_tree_row_reference_inserted() diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8606a4d23d..cb9eea4523 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,4 +1,10 @@ -2002-02-26 Vitaly Tishkov +Tue Feb 26 15:04:33 2002 Owen Taylor + + * gtk/gtkentry.c (gtk_entry_enter_text): use + the cursor position _after_ deleting the text + as the position to insert at. (#72717, Jan Mynarik) + +2002-02-26 Vitaly Tishkov * gtk/gtktreemodel.c misprints in documentation for gtk_tree_row_reference_inserted() diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8606a4d23d..cb9eea4523 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,4 +1,10 @@ -2002-02-26 Vitaly Tishkov +Tue Feb 26 15:04:33 2002 Owen Taylor + + * gtk/gtkentry.c (gtk_entry_enter_text): use + the cursor position _after_ deleting the text + as the position to insert at. (#72717, Jan Mynarik) + +2002-02-26 Vitaly Tishkov * gtk/gtktreemodel.c misprints in documentation for gtk_tree_row_reference_inserted() diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 3a4dcfbaa9..663b8a4026 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -2280,7 +2280,7 @@ gtk_entry_enter_text (GtkEntry *entry, const gchar *str) { GtkEditable *editable = GTK_EDITABLE (entry); - gint tmp_pos = entry->current_pos; + gint tmp_pos; if (gtk_editable_get_selection_bounds (editable, NULL, NULL)) gtk_editable_delete_selection (editable); @@ -2290,6 +2290,7 @@ gtk_entry_enter_text (GtkEntry *entry, gtk_entry_delete_from_cursor (entry, GTK_DELETE_CHARS, 1); } + tmp_pos = entry->current_pos; gtk_editable_insert_text (editable, str, strlen (str), &tmp_pos); gtk_editable_set_position (editable, tmp_pos); } -- 2.30.2